Fix an RTL problem with toggles in expander columns. (#341896, Roozbeh

2006-05-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): Fix
	an RTL problem with toggles in expander columns.
	(#341896, Roozbeh Pournader)

diff --git a/ChangeLog b/ChangeLog
index 4889a83084b31926027d9e96c459891d5e78b017..adbdabeb9592f84454496cc9b79574a86e347523 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Fix
+       an RTL problem with toggles in expander columns. 
+       (#341896, Roozbeh Pournader) 
+
 Mon May 15 15:12:05 2006  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtklayout.c (gtk_layout_realize),

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4889a83084b31926027d9e96c459891d5e78b017..adbdabeb9592f84454496cc9b79574a86e347523 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): Fix
+       an RTL problem with toggles in expander columns. 
+       (#341896, Roozbeh Pournader) 
+
 Mon May 15 15:12:05 2006  Søren Sandmann  <sandmann@redhat.com>
 
        * gtk/gtklayout.c (gtk_layout_realize),

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 31924721556c7a8a1bfd6b9f08b426175ec0e012..54d166c9c526f3db82f58704998f24c692436ec5 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -2340,9 +2340,10 @@ gtk_tree_view_button_press (GtkWidget      *widget,
              cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
              cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
 
-              if (TREE_VIEW_DRAW_EXPANDERS(tree_view))
+              if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
                {
-                 cell_area.x += depth * tree_view->priv->expander_size;
+                 if (!rtl)
+                   cell_area.x += depth * tree_view->priv->expander_size;
                  cell_area.width -= depth * tree_view->priv->expander_size;
                }
            }